From 25ec99cc814fc2435c25d26e111af64086d56e8e Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 18 Feb 2009 08:53:52 +0000 Subject: [PATCH] ia64: Fix the missing msi.h by accident, and enhance the check for one BUG_ON. Signed-off-by: Xiantao Zhang --- xen/drivers/passthrough/vtd/ia64/vtd.c | 3 ++- xen/include/asm-ia64/msi.h | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 xen/include/asm-ia64/msi.h diff --git a/xen/drivers/passthrough/vtd/ia64/vtd.c b/xen/drivers/passthrough/vtd/ia64/vtd.c index 9958ce2bbe..91d6338d58 100644 --- a/xen/drivers/passthrough/vtd/ia64/vtd.c +++ b/xen/drivers/passthrough/vtd/ia64/vtd.c @@ -141,6 +141,7 @@ static int do_dom0_iommu_mapping(unsigned long start, unsigned long end, void iommu_set_dom0_mapping(struct domain *d) { - BUG_ON(d != dom0); + if (dom0) + BUG_ON(d != dom0); efi_memmap_walk(do_dom0_iommu_mapping, d); } diff --git a/xen/include/asm-ia64/msi.h b/xen/include/asm-ia64/msi.h new file mode 100644 index 0000000000..2adc2ab743 --- /dev/null +++ b/xen/include/asm-ia64/msi.h @@ -0,0 +1,20 @@ +#ifndef __ASM_MSI_H +#define __ASM_MSI_H + +/* + * MSI Defined Data Structures + */ +#define MSI_ADDRESS_HEADER 0xfee +#define MSI_ADDRESS_HEADER_SHIFT 12 +#define MSI_ADDRESS_HEADER_MASK 0xfff000 +#define MSI_ADDRESS_DEST_ID_MASK 0xfff0000f +#define MSI_TARGET_CPU_MASK 0xff +#define MSI_TARGET_CPU_SHIFT 4 +#define MSI_DELIVERY_MODE 0 +#define MSI_LEVEL_MODE 1 /* Edge always assert */ +#define MSI_TRIGGER_MODE 0 /* MSI is edge sensitive */ +#define MSI_PHYSICAL_MODE 0 +#define MSI_LOGICAL_MODE 1 +#define MSI_REDIRECTION_HINT_MODE 0 + +#endif /* __ASM_MSI_H */ -- 2.30.2